forked from sonicretro/skdisasm
-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge upstream #4
Open
MainMemory
wants to merge
73
commits into
flamewing:master
Choose a base branch
from
MainMemory:merge-upstream
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GetFloorPosition_FG and GetFloorPosition_BG were outrageously bad names given that they are also used for finding walls and ceilings.
zFinishTrackUpdate actually clears variables relating to modulation envelopes.
They now need to be matched in pairs.
To 1.42 Beta [Bld 151].
accurate-kosinski is more accurate, clownlzss is faster, and they're both now more portable. I've tested that produced ROMs are still accurate and functional.
Since I'm an Arch Linux user, it would normally be a bad idea for me to share binaries since they might expect a newer glibc than other distros provide. To work around this, I've compiled s3p2bin statically using the musl C standard library. This produces a more-portable binary that does not rely on a particular version of glibc.
(From the comments on 547d615) Clownacy Was this an accidental inclusion? flamewing Yes, I was debugging the generated command line to make sure that the path given to -i was valid, and forgot to remove it after.
This parallels the documentation of this code in my 'Knuckles in Sonic 2' disassembly. Between the two version, there are the following differences: * KiS2 changes Knuckles' radius multiple extra times. * S3K has code for reverse-gravity mode. * S3K has an extra block of code for detaching Knuckles from walls if if the floor is directly under him even when he isn't moving, which introduces a bug where Knuckles' climbing animation always resets to the first frame when he isn't moving up or down.
…merge-upstream # Conflicts: # AS/Linux/s3p2bin # AS/Win32/s3p2bin.exe # AS/s3p2bin/Makefile # AS/s3p2bin/accurate-kosinski/LICENCE.txt # AS/s3p2bin/accurate-kosinski/kosinski_compress.c # AS/s3p2bin/accurate-kosinski/kosinski_compress.h # AS/s3p2bin/clownlzss/LICENCE.txt # AS/s3p2bin/clownlzss/clownlzss.h # AS/s3p2bin/clownlzss/common.c # AS/s3p2bin/clownlzss/common.h # AS/s3p2bin/clownlzss/kosinski.c # AS/s3p2bin/clownlzss/kosinski.h # AS/s3p2bin/memory_stream.c # AS/s3p2bin/memory_stream.h # AS/s3p2bin/s3p2bin.c # Lockon S3/LockOn Data.asm # Lockon S3/LockOn Pointers.asm # Sound/Flamedriver.asm # sonic3k.asm # sonic3k.constants.asm
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.